]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
authPrompt: Hide cancel button on unlock screen
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Fri, 14 Feb 2020 16:14:55 +0000 (13:14 -0300)
committerFlorian Müllner <florian.muellner@gmail.com>
Fri, 14 Feb 2020 20:49:57 +0000 (20:49 +0000)
As per the latest design review, hide the cancel button
on the unlock dialog.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1006

js/gdm/authPrompt.js

index 2f98989078a376df233c16cf5598d4e41a248255..42638bee5f69b04edc60655abddd7b0a376f1fb2 100644 (file)
@@ -81,6 +81,8 @@ var AuthPrompt = GObject.registerClass({
         });
         this.add_child(this._userWell);
 
+        this._hasCancelButton = this._mode === AuthPromptStatus.UNLOCK_OR_LOG_IN;
+
         this._initEntryRow();
 
         this._capsLockWarningLabel = new ShellEntry.CapsLockWarning({
@@ -123,13 +125,16 @@ var AuthPrompt = GObject.registerClass({
         this.cancelButton = new St.Button({
             style_class: 'modal-dialog-button button cancel-button',
             button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-            reactive: true,
+            reactive: this._hasCancelButton,
             can_focus: true,
             x_align: Clutter.ActorAlign.START,
             y_align: Clutter.ActorAlign.CENTER,
             child: new St.Icon({ icon_name: 'go-previous-symbolic' }),
         });
-        this.cancelButton.connect('clicked', () => this.cancel());
+        if (this._hasCancelButton)
+            this.cancelButton.connect('clicked', () => this.cancel());
+        else
+            this.cancelButton.opacity = 0;
         this._mainBox.add_child(this.cancelButton);
 
         let entryParams = {
@@ -433,7 +438,7 @@ var AuthPrompt = GObject.registerClass({
     reset() {
         let oldStatus = this.verificationStatus;
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-        this.cancelButton.reactive = true;
+        this.cancelButton.reactive = this._hasCancelButton;
         this._preemptiveAnswer = null;
 
         if (this._userVerifier)